Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update glTF add-on imports to support Blender 4.3 #322

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

Exairnous
Copy link
Contributor

@Exairnous Exairnous commented Dec 8, 2024

A lot of the files in the glTF add-on were renamed to be shorter to better accommodate the path length limit in Windows for the Blender 4.3 release (KhronosGroup/glTF-Blender-IO#2331). This prevents the Hubs add-on from loading at all because many of the previous imports are no longer valid.

This PR fixes the imports and restructures the glTF add-on imports so that imports common to all versions are done first, then each Blender version has a section for the rest of it's imports from the glTF add-on. This results in some duplication of imports, but keeps things clear and simple.

Cleanup:

  • Several imports from the same file have been combined into a single import.
  • Imports at the beginning of the file have been ordered alphabetically (mostly).
  • Imports at the beginning of the file with the format from x import y have been placed after imports with the format import x.
  • One of theBLACK_LIST imports has been moved to the top of its function to be more readable with its increase in complexity.
  • Added a comment to describe why BLACK_LIST is imported in a function instead of at the beginning of the file.

@Exairnous Exairnous force-pushed the support-blender-4.3 branch 3 times, most recently from 4f1ff3e to 85d9a15 Compare December 8, 2024 09:45
@Exairnous Exairnous marked this pull request as draft December 8, 2024 12:46
@Exairnous Exairnous force-pushed the support-blender-4.3 branch from 85d9a15 to 87eebcb Compare December 8, 2024 14:22
@Exairnous Exairnous marked this pull request as ready for review December 8, 2024 14:25
A lot of the files in the glTF add-on were renamed to be shorter to better accommodate the path length limit in Windows for the Blender 4.3 release (KhronosGroup/glTF-Blender-IO#2331).  This prevents the Hubs add-on from loading at all because many of the previous imports are no longer valid.

This commit fixes the imports and restructures the glTF add-on imports so that imports common to all versions are done first, then each Blender version has a section for the rest of it's imports from the glTF add-on. This results in some duplication of imports, but keeps things clear and simple.

Cleanup:
* Several imports from the same file have been combined into a single import.
* Imports at the beginning of the file have been ordered alphabetically (mostly).
* Imports at the beginning of the file with the format `from x import y` have been placed after imports with the format `import x`.
* One of the`BLACK_LIST` imports has been moved to the top of its function to be more readable with its increase in complexity.
* Added a comment to describe why `BLACK_LIST` is imported in a function instead of at the beginning of the file.
@Exairnous
Copy link
Contributor Author

I'm merging this since there have been no objections and @Spiderguy-F gave his approval in Discord (https://discord.com/channels/498741086295031808/964183314674098276/1320375581698949121).

@Exairnous Exairnous merged commit d42ae40 into master Dec 30, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant